IAMDOC-93: Updated with some changes done during partial review