Added missing default values for options