Refactored toolkit loading process.