Updates to more services to remove promises