Add support for default value