Refactored and modelled according to the new 0.6.4 samples