Addition of checks for Data Directory existence