Moved client helper functions to separate module