Improved JSON load