Use universal module definition
Add queue