Updating to use the new OOP settings