Added some functions to manipulate client instance