InFusion total refactoring