I think you are right. I will refactor it later. Thanks.