Added additional model classes & updated work on deserialization