Changed option lists and default values