Modifying RandomMover architecture