Update up to changes in d package