Refactoring Serializer