More Druid resto updates