New zap client to work with zap weekly build