Enhancement for Keys class