Made json cross friendly