Improve serializers