Moving to JSON based generation