Changed source_id to pid (permanent ID)