moved Queue to an Extension