Replaced mapper with join function