Fixed json files to make it work with codegen