Storage extracted from client-code