Enhancements for usability