Added event to CollectionBase...

..., refactored