Add more shortcuts and refactoring