Add CollectionBase and fix Connect class