Refactor of whole Game data layer, to adapt to defined API