Toolboxes refactoring