Add support for conditions