Updating to use new Template parsing options