Custom Event Framework added