Added a storage_id subdirectory if provided