Converted to Ruby 1.9 hash syntax