Tortoise JSON serializer improvements