Added support for other pids that are not ranks