Added map location and class for loading data