Add remote storage support
Add remote storage support