Add support for default values