Eliminated cyclic dependencies