A bit more config refactor