Queue Manager added, duplicate classes removed