Streamline the queue management