Response waiter takes an extra param