Added Mapping Support

Need to start to categorize the data.