Properly loads new map format now...