More deps and architectures