Complete transition to DIBuilder