Perfomance improvements of RandomMapper