Double namespace
Queue refactored