Switch from class to instance of scorecard
Make error matching more resilient