Updated LeanMapper