Fixed circular dependencies