Refactors for shortcut compatibility