Fixed a bug, added core support