Changes to core module