VIS refactoring