Added ondemand plugins support.