Improve core implementations