First fix for emi_storage_records, added xml boiler plate