Added a few more shortcuts