Add support for PID