Minor updates to code. Added new JSON definitions.