Adding changes for modules to be compatible with 2.5.0 core.