update to include templates of remaining object types