Changes made as per the review comment