Reorganized methods in client class hierarchy.