Updated with new API locations