Adding mapping for folding