Make config less confusing