Toolbox refactor