classes and test for serialization added