Add close support for DefaultValue in templates

Add close support for DefaultValue in templates