Refactored to remove references to v4.