Change and finish ClientWrapper to ClientMessager