2.21.1 improved collection classes