Comment by navendu_p

We will change that. Seems like a good idea