Add support to PID and other commands