Made changes on Core library.