Refactored request queue