Add basic queueing support