Added support for conditional tabs