Add pass_or_trait security option