Adapting to monitoring API changes - removed context SPI