wip: refactor configuration