Updating previous PR to match the new source organization