Added Template managing