Core files
Core changes.