Improve the RakeCore