Add offline component
Improve Storage service