Add more shortcut for usability