Introduce rip cord for circular dependency protection