Added conditional template