Swithed to complied template structure