Update to client and vsaddin