issue #167 extended the core modules.