Integration after refactoring