Added server start/stop