Improved Sensor table attributes & relationships