Breaking out the client utility functions for clarity