More progress consolidating map managers