Better datadir mod support