Refactor serializers