Made the endpoints list more robust as we transtition to the new api