Bring up to date with new Json api