Updates to client and addin