Added single template switch for #16