added cases into template file