Collection model changes. Fixes #182