Refactor Serializers