Fixed Data directory issue