Move VARO functions to extra class