Make Module wrapping optional
Fix flags bug, make [Require] replacement simpler