Modifications to move to latest dx_ API