- Add shortcut support
- Fix quote usage