Adapted to mapper simplification.