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