Added map controller
Added map controller