Adapt latest OnDemand version plugin to Black Hole