CFY-660 updated es schema with node and node instance types