WIP: 2.0 EE config changes

@lucperkins Ah, completely missed that part! Sorry! :)