Removed order dependence of JSON fields