Added Storage Client. Not tested yet