change for suport kryo serialization