Add queue and 3.1 (TripleStack)