Begin data view refactoring