Improved usability