Added queue support
merged package.json