Updated CompanionGenerator implementation to match interface changes