Added new fields, not yet serialized
Cleaned up assertions/error handling