Rewrite event system to avoid licensing issues