Amended the serialization infrastructure