Improvements on core.