Some work on adding collection classes