Made map more compact