modifications in core modules