Server only mode added