Added in templates