Support renaming keys. Improved code readability.