Converted to ruby 1.9 hash