Done some refactoring on event_manager.