Complete the mapper