Update to extend newer core-object