Events Core modifications