Will fix in another PR.
For many of them, it will be naturaly fixed by custom Event class.