Put the new structure in fields
Updated input options list