Working fo sampler, not clear if fully ok
Added mapping if possible of the fields