Refactoring views scheme