Updated core to deprecate calls and add new methods and classes as per new code review