moving to use custom JSON serializer everywhere