Improve key settings