Fixes the generators to work with modules