Changes to van and van_spec