Finalize initial P.O.C. for module support