Added option support