Adding more control over data directory path