Storage release, Serialization and Deserialization fixes, class diagram review