added templates feature