[NT] Views refactoring