Improved shortcuts