Added more shortcuts