Adding support for default from the env