Added map logic support