Add queue handling