Major updates to make DS work again with all recent core changes