Fields some option support + test