CELDL-77 - client impl