Updated client to support the latest source