Follow up to make changes as per review comments - RA-199