more map logic integration