Simplify Event definitions