- added a better deserialized version for some objects