Move hooks for v2 conformance.