Finishing the mapping functionality