refactor serializers to make the master serializer work better