[*] Server validation added