CDAP-811: Addressed PR comments