Added support for the --events option