Classes updated to latest json schemas