Added types with undefined and enchancing defaults.