Solves circular dependencies