Make the sampler independent of the digiloader and payload types

Make the sampler independent of the digiloader and payload types