Changed class for tool commands