Added support for default value if key is not set