Add definitions to extract the core