Refactored matchmakerServer and commands