Add names getter.
Fix names getter.
Improve key handling.
Improve key handling logic.