Add StorageType and OptionGroupName properties