Repackaged some of the client