Fix object deserialization, add new