Template framework update