Added new models and upgraded deserialize