Use 1.8 hashes to keep compatibility with 1.8