Refactor client, join manager after message