Adding queue support