Updated with mapping support"