Add build core support