Updated to properly handle the newly introduced targetRemovedKeys fiels, now for all methods