Refactoring for PlatformLoader