Added support for default value