Enhanced map generating