Added multiple core support