More changes for usability