Added more ways to fire events