Finished the MapConverter