add core support