refactored ToolsManager suite