Improve end user usability