Update template handling
Add utilities