Adds 'Export' and Ctrl-S support