Updated map method