added new option support