Update for new dfm
Add workaround for submodules