Add close support for DefaultValue in templates