Starting to implement new sampler API