Adding and renaming a bunch of new options