Decouple tags from collections
Revert event capabilities
Refactor core capabilities