Changes to adapt to Gamify refactoring