Update some option stuff for new DT api

Plenty more to come