Modified csv / entry / entry_repo / loader, to reflect refactored methods.