Use STORAGE_ROOT where appropriate