Adapt to new Google API and OC 5.0.5