Add most core support