Config refactor