Added server validation
Fixed validation