Major refactoring to allow to add logical operators OR and AND