Updated LeanMapper and LeanMapper Query