WIP: 2.0 EE config changes

@dmitrizagidulin For future reference, any PR names that begin with "WIP" are works in progress. Still a long way to go on this one :)