Rejiggered models to include sensor ids