More conversion to promises in the client code