Rationalise MSP polling based on capability