WIP: configuration refactor