changes to support akka serialization