Updated client version handling