Allow to keep track of locally started servers
Autocommit Tue Sep 23 12:52:00 EST 2014