Initial ondemand clusters support