we should use withDefaultValue here as well