Refactoring -> optimized data retrieving for data views