added new features to templates