Updated documentation and fixed ZCLOUD-160