Architecture changes on Gamify framework