Improve key info behavior
Refactor and remove duplications