Modified helper functions for the client