Complete split of v1 and v2 components