Added storage handler.