Further refactoring of vies