Added MapCtrl and template