Add modified core files

Add modified core files