Added pid tracking