Improve usage