Updated queue class