Fixed circular dependencies.