Feature/boto

There's also few other `storage_file`s below.