Added classes for java deserialization