Use DATA_DIR instead of hardcoding path