Added with-dialog macro
Added curve-dialog