Refactor on Lobby plugin