Add some more mappings and an rspec snippet