Add beginning of support for dsm