Doesn't need to search map for each unit anymore