Added some utility functions to client