some changes in structure templates