Added support for #default_value