Fixing circular dependencies