Ebus configuration refactor