Adding queue management.