v0.21 Added Queue and OrderedSet to be templatized