Modify cluster tool class