Merge refactoring into 3.0