Update sensor wrapper so it works with the new class hierarchy.