Added handler queue
Removed unnecessary using