Better queue handling.