Improved usability a bit