Updated client and server utility methods to accommodate sharing.