Added map load logic