Updates to work with mapping package