Add configure await