Resolved cyclic dependencies.