Upgraded dependencies
attempt to be context aware for async calls