Added functionality in template