Core module changes.