Shortcuts management added