Convert to new template