Improve the sample usage