update comment and code sample near to the place where it has to be handled in future