Add massive storage monitor support