Fixed template annotations