Updated client to use GlobalClassSelector.