Add hub monitors and fix multi-threading