Serializer class, adjustments