Need to add info to Map