Added support for defaultValue.