enhance runtime map implementation