Various changes to core module.