Partial rewrite of Message/Client