Added changes in the core-file