Adding B2G event selection