Updated to support CSH's configuration.