Refactor for new translation driver signatures