Improve data directory behavior