Fix sensors. Add more props