Update core module to new format