Options updated with defaults