Added map interfaces + map entry impl