Revert "Revert "Estructure Templates Fix""

This reverts commit 88bf176d38963f8388ca2c6e7c09ae206c34d949.