Added key table filling