Made consistent with newest Edgel API