Added support for conditionals