CIMI: Use #collection_class_for helper for all collections in client