Improve storage capabilities

Change-Id: I560a98fefd1dca28182aefc5343f3eab982991a5
Merge "Improve storage capabilities"