Untidy queue class added