Conform with proposed option formats