Fixed ResolvedEntity serialization