Thanks, Updated the patch as per the suggestions.