Refactored shortcuts