More deps management