WIP Adaptation to support Java serialization