Brought up to date with JSON changes