Remove use of global model properties and go through the deserializer