Citrus: Updating mapping as requested by citrus.