Updates to Angular and templates