Added key tracking