Added critical section around comet actor mapper