Changed to use new data directory