Updating as per review comments