Add trap queuing back