Add protection for default values in types