Your suggestion makes very much sense. I will commit with new changes required.