Collection adoption

Trying some fixes and enhancements