Make config more consistent