Issue #510 - There were some new collection classes I missed the first time