Added device tracking