Modifications of the client