-Queue module and main updated