Improve the usability