Added map model and view