Improve change of data dir