Fixed the serializedTypes class to cover more types and revised additional files