Deal with non-hash key/version keys