Changes to support odo 8