Added server option