Added some shortcuts etc