Improved PID support.