Change to using proper dmr files