Updates to make the DPI bridge easier to implement