Add core support