Removed todos and better gets for valves and pumps datas