Added support for new json files