Updated vies to use new templates