Removed dependency on Core, now Core_kernel