Refactoring due to data layer source changes