Changes to using a Set for tracking Achievement classes