Full integration refactoring.