Continued refactoring of request queue workflow