Finalize refactoring for 3.2.0