IFRC: Added closures to each module