Added support for module and admin overrides.