Updated Key subclass