Adding --noserver option