More consistent configuration handling