Changed from context to coroutine