Rework SerializerBase