Apple plans to make a number of changes to AirTags and the Find My network to tackle unwanted tracking.

Apple recently announced the changes, saying it worked closely with security experts and law enforcement to determine what improvements need to be made to better protect users. Initially, the changes will include new notifications and alerts, as Apple works to add new safety features, coming later this year.

In a future update, new AirTag users will be notified that the product is only intended for use on their own property. If you misuse it, law enforcement may obtain information that identifies the owner of the AirTag.

AirPods have also been used to track people, and in that same update, an alert will appear on your iPhone letting you know if you’re traveling with an unknown AirPod. Previously, the alert simply said “Unknown accessory detected.”