Restructured sensors to automatically include them.