Updated to take advantage of the module overrides.