Attempt to reduce dependency cycles