Improve data dir handling
debug