Addition of Data directory validity checks