Improve game architecture