Completed support for conditional requirements