Avoiding circular dependencies