Add SingleEntryMap + Some Changes