Refactored scorecard model for better score adding