Made events modular as well