Change back to value types (nullable types where useful for dumper)