CaseLoader system refactoring