Updated to use latest endpionts for APIs