Adding improve template management