Refactored application level data loading