Made consistent with config