Update to use 1.8 style hash