Loader: Refactored interface such that data is no longer stored by loader.