Refactoring configuration toc