Related to #46 , we still need to fix vignette code, and the cli code to use the updated classes introduced.
