Added storage to client