Events modifiers update for CM, another type fix