Make `DataLossProtect` fields required and remove wrappers