Moved more Collection behavior to traits
Moved more Collection behavior to traits