Renamed 'base' to 'core'