Post integration refactoring