Add more doc support and sample client