Refactors for compatibility with shortcut