Updated Template references and docs