Varfoo 2.0 design refactored