Changes as per Core Changes