Improve serializer