refactored scorecards model