Added server validation