Unify entry types in fusion module