Don't use data dir anymore