Added functionality to make event modular