Made Queue use new class