Add SID to game and refactor some code