Moved to using ObjectWrapper converter