Modifications to allow the mapper to run locally.