Added and reorganized options