Adapted to new ped_parser