Finished refactoring base events