Split ExtensionService into smaller methods