Added support for onxxx events