Changes to use the new Ruby 1.9 hash syntax