Removed queue form core
Merged with previous changes