Add ondemandplus and wheatley