Added support for conditional elements