More keys can now be get/set.