Fixed dependencies
Refactor base instances for events