Changed map format, added diagonal edges