More consistent config with Source option