Updated model file to reflect last commit's changes.  Updated json files for accurate addition and consistency betweeen json files