Updated map model stuff