Adding server validation