Added tooling; Fixed issue with queue blocking