Config rework WIP