Added untested serialization code