Added key control