Added map manager