Data moved to json file, updated template