Updated client to work with new libs.