Mapping is now working correctly. Fault tolerance is correctly functioning now.