Added map controller