Improvements related to usability