Added the generic json file and small updates