Replaced direct method calls with object.