Added map holder classes