Changed queue classes