Added more sensors, nearly complete list