Finish implementing fetch-based mapping