Add :exit-on-close and :opts options