Added more option support