Tidied up ModelLocationDeserialiser