Switch to ordinary hashes