Entity serialization working -- fix