Added templates system