Updated docs & improved map handling