Add Options
Simplify some fields