Refactored queue manager class