New MapEntry - Trying to add somekind of wrapper