Improving serializer