Added eventhandler to suite