Refactor to remove v2