Added Location serialisation from Model