some changes in adding constructions into template