Review fusion module
Complete conversion of lib module