Optional RSSI tracking added