Gamify Client and Server architecture changes