Add some mapping capabilities