Add enabled check for events