Improve map for gnarly repos