Updated map directive