Added changes for continued ToolInterface functionality