Move at compute_map creation to speed things up