Improvements on usability