Updated to work with DoX module