First addition of revised module generation code.