Some changes in api for devices and tracking