Working version with shortcut support