Updated to dma-commons changes