Get rid of the external queue dependency