Added new mapping capabilities