Using ToolStatus instead of Risk class.