Add CometActorMapper to avoid serialization bug