All options are now stored in a struct