Adding support for RSSI