Serializers refactorization