Added Template Value check