Added server option along with existing cli option