Adding waiter type to core