use new ObjectStreamWrapper class where needed