Improve usability