Bug 957731 - Made wrapper content OOP again