Added support for conditional composition in the composer itself