Serializers refactoring