Added shortcuts & related refactorings.