Started reworking serialization