Continued work on making module generic.