Tweaked to support the update sensors use case