Updated to be compatible with Native Json