Added option to set event selection