This report describes development of the xenon analysing system SAUNA Field with the aim to improve the sample handling during an On-Site Inspection (OSI). A multisample inlet with RFID tags have been designed to allow for processing several samples in a row without operator interaction. This development is made to lower the workload when operating the system. RFID tags keep track of the data associated with each sample which improves the sample tracking and also lower the amount of manual work needed when operating the system.