Added more flexibility to input params when combining with or, and.