Improve templates system.