Mapping : code more generic