global refactoring for v2 started