Add more option support.