Better code organization in fusion module