Serialization: Fixed missing type names
Missing IDisposables
Formatting