Restructurization and adding #id of players to commands