Update to promises in routing