Removed hardcoded queue names