Change the result object to use a score object which can have a goal and a points value (points optional) to accommodate different game types. Also use a new base class model that uses pojomatic to auto implement object comparison, hashcodes etc