Standardized the way options are extended with defaults