add check for alternate description class and better location_info support