Use a different structure due to pip failures