Made the changes to mapper based on the project specs