Add pretty print
Search the key too
Refactor add